From: Eli Zaretskii Date: Wed, 11 Dec 2013 17:06:50 +0000 (+0200) Subject: Another merge from trunk. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2035^2~1 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0ec6c340e90369b5921b35bed3bd4cfc0368723e;p=emacs.git Another merge from trunk. --- 0ec6c340e90369b5921b35bed3bd4cfc0368723e